Minor leak fixes.

diff --git a/gpsbabel/easygps.c b/gpsbabel/easygps.c
index bcfab3f03893bf150d4a61b042f1afe116f0a3e1..7d804e3c76578dc826dcec6ba4cb3d3248787564 100644 (file)
--- a/gpsbabel/easygps.c
+++ b/gpsbabel/easygps.c
@@ -120,6 +120,7 @@ data_read(void)
                                break;
                        case 7:
                                wpt_tmp->icon_descr = (char *) pread();
+                               wpt_tmp->wpt_flags.icon_descr_is_dynamic = 1;
                                break;
                        case 8:  /* NULL Terminated (vs. pascal) descr */
                                bbufp = bbuf;

diff --git a/gpsbabel/kml.c b/gpsbabel/kml.c
index c4eea6765ea3a172c3fcf0e4ba9faca09935692c..470e47714e40f83f806bbd67fb2b2f04ba88f705 100644 (file)
--- a/gpsbabel/kml.c
+++ b/gpsbabel/kml.c
@@ -266,7 +266,7 @@ static void kml_output_tailer()
     fprintf(ofd, "\t</Placemark>\n");
   }
   
-  free(point3d_list);
+  xfree(point3d_list);
   point3d_list = NULL;
   
   fprintf(ofd, "</Folder>\n");

diff --git a/gpsbabel/nmea.c b/gpsbabel/nmea.c
index 27b48bd037cd3953bd0dc31218b26e8154321372..af929f4839976ea76993d8b8b678117cf7a47d95 100644 (file)
--- a/gpsbabel/nmea.c
+++ b/gpsbabel/nmea.c
@@ -169,6 +169,7 @@ static  void
 nmea_wr_deinit(void)
 {
        fclose(file_out);
+       mkshort_del_handle(mkshort_handle);
 }
 
 void

diff --git a/gpsbabel/tmpro.c b/gpsbabel/tmpro.c
index 4940f20cc0c7e5c02f0253052082769cec3ddbf6..5938fe4ed59aa49823fdc4c6a170e0bf896f0c10 100644 (file)
--- a/gpsbabel/tmpro.c
+++ b/gpsbabel/tmpro.c
@@ -109,7 +109,9 @@ data_read(void)
                        */
                        holder = csv_stringtrim(s, "", 0);
                        if (strlen(holder))
-                       wpt_tmp->description = holder;
+                               wpt_tmp->description = holder;
+                       else 
+                               xfree(holder);
                    break;
                case 3:
                    wpt_tmp->latitude = atof(s);
@@ -142,6 +144,8 @@ data_read(void)
                        holder = csv_stringtrim(s, "", 0);
                        if (strstr(holder, "http:") != NULL)
                                wpt_tmp->url = holder;
+                       else 
+                               xfree(holder);
                        break;
                default:
                    /* whoa! nelly */